[tests] Move filechooser test files to correct location

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 6b9b3e4f859c0ad6bc0cd11ae39d8337d8fa50f7..86e10585f65d09cf4cd60dfb5595030548c09433 100644 (file)
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -62,11 +62,10 @@ object_LDADD                         = $(progs_ldadd)
 crossingevents_SOURCES          = crossingevents.c
 crossingevents_LDADD            = $(progs_ldadd)
 
-# this doesn't work in make distcheck, since it doesn't
-# find file-chooser-test-dir
-# TEST_PROGS                   += filechooser
-filechooser_SOURCES             = filechooser.c pixbuf-init.c
-filechooser_LDADD               = $(progs_ldadd)
+# Should be ported to new API's
+#TEST_PROGS                    += filechooser
+#filechooser_SOURCES            = filechooser.c pixbuf-init.c
+#filechooser_LDADD              = $(progs_ldadd)
 
 TEST_PROGS                     += builder
 builder_SOURCES                         = builder.c
@@ -95,4 +94,9 @@ TEST_PROGS                    += action
 action_SOURCES                  = action.c
 action_LDADD                    = $(progs_ldadd)
 
+
+EXTRA_DIST +=
+       file-chooser-test-dir/empty     \
+       file-chooser-test-dir/text.txt
+
 -include $(top_srcdir)/git.mk

diff --git a/gtk/tests/file-chooser-test-dir/empty b/gtk/tests/file-chooser-test-dir/empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gtk/tests/file-chooser-test-dir/text.txt b/gtk/tests/file-chooser-test-dir/text.txt
new file mode 100644 (file)
index 0000000..cd08755
--- /dev/null
+++ b/gtk/tests/file-chooser-test-dir/text.txt
@@ -0,0 +1 @@
+Hello world!

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3083b29a09437a15dafb5e5a7f72563dbe202343..4069c079cb69f5e843ca14dd9f8556a8c5f27820 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -368,9 +368,7 @@ EXTRA_DIST +=                       \
        merge-2.ui              \
        merge-3.ui              \
        gnome-textfile.png      \
-       makefile.msc            \
-       file-chooser-test-dir/empty \
-       file-chooser-test-dir/text.txt
+       makefile.msc
 
 
 -include $(top_srcdir)/git.mk

diff --git a/tests/file-chooser-test-dir/empty b/tests/file-chooser-test-dir/empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/file-chooser-test-dir/text.txt b/tests/file-chooser-test-dir/text.txt
deleted file mode 100644 (file)
index cd08755..0000000
--- a/tests/file-chooser-test-dir/text.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!